Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wallets and Bank Cards #2979

Merged
merged 21 commits into from
Jun 20, 2024
Merged

Wallets and Bank Cards #2979

merged 21 commits into from
Jun 20, 2024

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented May 11, 2024

About The Pull Request

Makes wallets part of the outfit shit and splits money behavior of access cards into bank cards

Why It's Good For The Game

Changelog

🆑
add: Bank accounts are now handled through cash cards! You now spawn with a wallet to store your extra card!
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Code change Watch something violently break. labels May 11, 2024
@github-actions github-actions bot requested a review from MarkSuckerberg May 11, 2024 06:37
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label May 27, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 31, 2024
@FalloutFalcon FalloutFalcon marked this pull request as ready for review May 31, 2024 11:56
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner May 31, 2024 11:56
@FalloutFalcon FalloutFalcon added the Test Merge Required They'll have to do it for free. label May 31, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
Copy link
Contributor

github-actions bot commented Jun 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
@Anticept
Copy link
Contributor

Anticept commented Jun 6, 2024

I'm taking a guess here, but loadouts are currently broken and not giving us our boxes with those items, and many of us had wallets selected or have wallets that come with loadouts.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 7, 2024
Copy link
Contributor

github-actions bot commented Jun 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Anticept
Copy link
Contributor

Anticept commented Jun 7, 2024

Can I suggest not removing wallets from prefs for now while this is in progress? That way if it's unTM'd, we'll still have wallets if we forget to check for them.

@FalloutFalcon
Copy link
Member Author

Can I suggest not removing wallets from prefs for now while this is in progress? That way if it's unTM'd, we'll still have wallets if we forget to check for them.

its not a big enough issue. it will probally be merged soon..

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jun 8, 2024
@Imaginos16 Imaginos16 added Test Merged They've done it for free. and removed Test Merge Required They'll have to do it for free. labels Jun 12, 2024
@Anticept
Copy link
Contributor

There is one issue: access cards have to be removed and reinserted into the wallet to display the job title properly.

@rye-rice rye-rice added this pull request to the merge queue Jun 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 20, 2024
@rye-rice rye-rice added this pull request to the merge queue Jun 20, 2024
Merged via the queue into shiptest-ss13:master with commit 0ecc4ba Jun 20, 2024
14 checks passed
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Makes wallets part of the outfit shit and splits money behavior of
access cards into bank cards
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: Bank accounts are now handled through cash cards! You now spawn
with a wallet to store your extra card!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
@Mirag1993
Copy link

need an update method in the combined access variable in the wallet

@FalloutFalcon FalloutFalcon deleted the wallet branch January 7, 2025 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Test Merged They've done it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants